Repository navigation
fork seam check: refuse spare seam copies (#311 items 7/8) - #621
Conversation
- From upstream, a listed "added" copy the fork does not add over upstream is refused, naming the fix; right after a rebase it is a note and fork-follow's lowering commit drops it (only ever lowers). - A pull request that drops a listed seam line drops it from its own list in the same change, exactly (main's copies less the dropped ones). - fork-seams.json: the four spare serverSettings.ts copies go; the list is now exact from upstream. - Docs and tests (unit, command line, after-rebase lowering, rerun). Fixes #311 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Lens B review (read-only): SAFE to merge. The new rule only tightens the gate: it fails closed, it adds no upstream drift, and its refusals name the fix. There is one major gap. A spare copy can still reach main through a pull request, and it then stops fork-follow instead of being refused in that pull request. A follow-up is fine; it fits best with #599. What I checked
Major
Minor
Overlap with #599The textual conflicts are only in 🤖 Generated with Claude Code |
|
Review (lens A, read-only): SAFE. Nothing blocking and nothing major. Three minor points and one note follow; none needs to hold the merge. What I checked (head 77e3042)
Minor
Note
CI: all required checks are green ( 🤖 Generated with Claude Code |
Fixes #311
The last open point of #311 was items 7 and 8: the generic seam lines in
apps/server/src/serverSettings.ts(};,settings = {, and so on). This PR closes the gap those lines left open. Items 1–6 and the comment were already fixed on main.Status of each #311 point (checked against main)
lost{lines, gone}counts, held exactly).--from-upstream, passed by fork-follow).serverSettings.tsWhat changed
The risk behind items 7 and 8 is that a generic listed line like
};is a free pass: the run lets the fork add as many copies as the list names. A listed copy the fork does not actually add is spare room, so a later change could add that line without announcing it.addedcopy that the fork does not add over upstream. The refusal names the fix ("remove it fromadded" or "list it N×").Lowered: a.ts: "added" 2 -> 1 lines (spare: ...)). It only ever lowers.addedmust list main's copies less the copies it drops. Too many leaves spare room. Too few would fail the next run from upstream. Either way the refusal names the right count.serverSettings.ts(};,settings = {,...managed.defaults,,continueThreadsAfterServerUpdate: false,). They are removed, and the entry'swhyis updated. Main's list is now exact from upstream, and both--from-upstream <merge-base> HEADand--config-ref origin/main origin/main HEADexit 0.docs/fork/updates.mddescribes the rule.Why the
serverSettings.tslines are not moved outState question (each case is tested)
Loweredline and noNote.announcedline is never spare.Tests that fail on the old code
Run against main's checker, 4 of the 91 tests fail; with this PR's checker all 91 pass:
findSpareSeamLinesand thelowerListchange, which do not exist on main.Mutation checks: each new refusal and the lowering have a test that fails when the code is removed or loosened:
all 10 were killed:
main().fork-follow.test.shpasses.Overlap with #599 (#552)
#599 adds
--upstream-baseand changesfindUnlistedChangesandmain(). This PR adds a new function (findSpareSeamLines), a block inlowerList, an export, and a few lines plus the hint wording inmain(). Expect small conflicts inmain()and the hint text only. Neither PR changes the logic the other one adds.No workflow files are changed.
General vs project
General: this is seam-check tooling that any fork using
fork-seams.jsongets. The only project-specific part is the list edit for this fork'sserverSettings.ts.🤖 Generated with Claude Code